Use union merge on the changelog file. #788
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nlewycky
force-pushed
the
feature/changelog-merge
branch
from
11ef1fb to
d0f85cf
Compare
MarkMcCaskey
approved these changes
Sep 13, 2019
This keeps both sides of a conflict. It's essentially the same as removing the conflict markers.
nlewycky
force-pushed
the
feature/changelog-merge
branch
from
d0f85cf to
abd71aa
Compare
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Sep 13, 2019
788: Use union merge on the changelog file. r=nlewycky a=nlewycky # Description This keeps both sides of a conflict. It's essentially the same as removing the conflict markers. # Review - [x] Create a short description of the the change in the CHANGELOG.md file Co-authored-by: Nick Lewycky <[email protected]>
|
bors retry |
|
Already running a review |
|
bors r- |
Canceled |
|
bors retry |
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Sep 13, 2019
788: Use union merge on the changelog file. r=MarkMcCaskey a=nlewycky # Description This keeps both sides of a conflict. It's essentially the same as removing the conflict markers. # Review - [x] Create a short description of the the change in the CHANGELOG.md file Co-authored-by: Nick Lewycky <[email protected]>
syrusakbary
approved these changes
Sep 13, 2019
Build succeeded
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This keeps both sides of a conflict. It's essentially the same as removing the
conflict markers.
Review